Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(deps)!: bump k8s dependencies to 1.30 #13413

Merged
merged 12 commits into from
Sep 17, 2024
Merged

chore(deps)!: bump k8s dependencies to 1.30 #13413

merged 12 commits into from
Sep 17, 2024

Conversation

blkperl
Copy link
Contributor

@blkperl blkperl commented Jul 30, 2024 •
edited
Loading

Motivation

  • K8s 1.26 is no longer receiving security patches

Modifications

  • updated go.mod to k8s 1.30
  • updated dist/kubernetes.swagger.json version to 1.30
  • updated workflow/executor/resource.go to non deprecated functions to appease the linter
  • updated from [email protected] to [email protected]
  • updated various files to the new ptr library to appease the linter
  • changed the metrics test contains assertion from status_code=200 to status_code=400 to pass the test
  • changed getEvents test helper to truncate annotations from events so that TestEventNodeEvents passes

Verification

Existing test coverage

blkperl added 4 commits July 29, 2024 18:09
@blkperl
chore(deps)!: bump k8s dependencies to 1.30
829516a 
Signed-off-by: william.vanhevelingen <[email protected]>
@blkperl
test: fix test
c53dd4f 
Signed-off-by: william.vanhevelingen <[email protected]>
@blkperl
chore: fix codegen
3046f1f 
Signed-off-by: william.vanhevelingen <[email protected]>
@blkperl
chore: whitespace
1180f80 
Signed-off-by: william.vanhevelingen <[email protected]>
@blkperl blkperl added type/dependencies PRs and issues specific to updating dependencies go Pull requests that update Go dependencies labels Jul 30, 2024
@blkperl
Copy link
Contributor Author

blkperl commented Jul 30, 2024

@agilgur5 is the mysql test a known failure or did the PR somehow break the metric?

@blkperl blkperl marked this pull request as ready for review July 30, 2024 16:03
@blkperl blkperl mentioned this pull request Jul 30, 2024
Closed
@agilgur5
Copy link

I don't recall this as a prior flake. You can re-run individual failed tests now (#13000) with a /retest comment to verify a flake. See my below comment as an example

@agilgur5
Copy link

/retest

@blkperl
test: fix contains in metric test
367a37a 
Signed-off-by: william.vanhevelingen <[email protected]>
@blkperl
Copy link
Contributor Author

blkperl commented Aug 9, 2024

hey @terrytangyuan could you take a look please? It's one PR like you requested in #12865

terrytangyuan
terrytangyuan reviewed Aug 10, 2024
View reviewed changes
Makefile
endif
$(GOPATH)/bin/go-to-protobuf:
# update this in Nix when upgrading it here
ifneq ($(USE_NIX), true)
# TODO: currently fails on v0.30.3 with
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What package is this?

Copy link
Contributor Author

@blkperl blkperl Aug 12, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure what you mean. It fails to make pre-commit -B when I bump the version for this go install

go install k8s.io/code-generator/cmd/[email protected]

terrytangyuan
terrytangyuan requested changes Aug 10, 2024
View reviewed changes
Copy link
Member

@terrytangyuan terrytangyuan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hold for v3.6

@terrytangyuan
Copy link
Member

Thank you for this! Since this is a breaking change, we cannot merge now.

@terrytangyuan terrytangyuan added this to the v3.6.0 milestone Aug 11, 2024
@Joibel
Copy link
Member

Joibel commented Sep 11, 2024

@terrytangyuan, any reason not to merge this to main only, which will become 3.6?

@terrytangyuan
Copy link
Member

You are right. We should merge it to main. Do you want to do another review?

@blkperl Could you resolve the conflicts? Thanks!

@blkperl
Merge remote-tracking branch 'origin/main' into k8s_1.30
80eee55 
Signed-off-by: william.vanhevelingen <[email protected]>
@blkperl
fix: lint
1a0a0dc 
Signed-off-by: william.vanhevelingen <[email protected]>
@blkperl
fix: lint
5d49047 
Signed-off-by: william.vanhevelingen <[email protected]>
@blkperl
Copy link
Contributor Author

blkperl commented Sep 11, 2024

@terrytangyuan I've resolved the conflicts. Thanks!

@blkperl
Copy link
Contributor Author

blkperl commented Sep 12, 2024

/retest

@terrytangyuan terrytangyuan merged commit 889a9d2 into argoproj:main Sep 17, 2024
27 checks passed
@blkperl blkperl deleted the k8s_1.30 branch September 17, 2024 22:16
@blkperl blkperl mentioned this pull request Sep 18, 2024
Open
@Joibel Joibel mentioned this pull request Sep 19, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@terrytangyuan terrytangyuan terrytangyuan approved these changes

Assignees
No one assigned
Labels
go Pull requests that update Go dependencies type/dependencies PRs and issues specific to updating dependencies
Projects
None yet
Milestone
v3.6.x patches
Development

Successfully merging this pull request may close these issues.
4 participants
@blkperl @agilgur5 @terrytangyuan @Joibel